Move a few more of these to subclass Maintenance.

diff --git a/maintenance/language/countMessages.php b/maintenance/language/countMessages.php
index 7d16915..826c43c 100644 (file)
--- a/maintenance/language/countMessages.php
+++ b/maintenance/language/countMessages.php
@@ -1,40 +1,65 @@
 <?php
+/**
+ * Count how many messages we have defined for each language.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @ingroup MaintenanceLanguage
+ */
 
-require_once( dirname(__FILE__).'/../commandLine.inc' );
+require_once( dirname(__FILE__) . '/../Maintenance.php' );
 
-global $IP;
-
-if ( !isset( $args[0] ) ) {
-       $dir = "$IP/languages/messages";
-} else {
-       $dir = $args[0];
-}
-
-$total = 0;
-$nonZero = 0;
-foreach ( glob( "$dir/*.php" ) as $file ) {
-       $baseName = basename( $file );
-       if( !preg_match( '/Messages([A-Z][a-z_]+)\.php$/', $baseName, $m ) ) {
-               continue;
+class CountMessages extends Maintenance {
+       public function __construct() {
+               parent::__construct();
+               $this->mDescription = "Count how many messages we have defined for each language";
        }
-       $code = str_replace( '_', '-', strtolower( $m[1] ) );
-       $numMessages = wfGetNumMessages( $file );
-       //print "$code: $numMessages\n";
-       $total += $numMessages;
-       if ( $numMessages > 0 ) {
-               $nonZero ++;
+
+       public function execute() {
+               global $IP;
+               $dir = $this->getArg( 0, "$IP/languages/messages" );
+               $total = 0;
+               $nonZero = 0;
+               foreach ( glob( "$dir/*.php" ) as $file ) {
+                       $baseName = basename( $file );
+                       if( !preg_match( '/Messages([A-Z][a-z_]+)\.php$/', $baseName, $m ) ) {
+                               continue;
+                       }
+                       $code = str_replace( '_', '-', strtolower( $m[1] ) );
+                       $numMessages = $this->getNumMessages( $file );
+                       //print "$code: $numMessages\n";
+                       $total += $numMessages;
+                       if ( $numMessages > 0 ) {
+                               $nonZero ++;
+                       }
+               }
+               $this->output( "\nTotal: $total\n" );
+               $this->output( "Languages: $nonZero\n" );
        }
-}
-print "\nTotal: $total\n";
-print "Languages: $nonZero\n";
 
-function wfGetNumMessages( $file ) {
-       // Separate function to limit scope
-       require( $file );
-       if ( isset( $messages ) ) {
-               return count( $messages );
-       } else {
-               return 0;
+       private function getNumMessages( $file ) {
+               // Separate function to limit scope
+               require( $file );
+               if ( isset( $messages ) ) {
+                       return count( $messages );
+               } else {
+                       return 0;
+               }
        }
 }
 
+$maintClass = "CountMessages";
+require_once( DO_MAINTENANCE );

diff --git a/maintenance/language/date-formats.php b/maintenance/language/date-formats.php
index 7adccf7..54a6a26 100644 (file)
--- a/maintenance/language/date-formats.php
+++ b/maintenance/language/date-formats.php
@@ -1,50 +1,76 @@
 <?php
 /**
- * @file
+ * Test various language time and date functions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @ingroup MaintenanceLanguage
  */
 
-$ts = '20010115123456';
+require_once( dirname(__FILE__) . '/../Maintenance.php' );
 
-       
-$IP = dirname( __FILE__ ) . '/../..';
-require_once( dirname(__FILE__).'/../commandLine.inc' );
+class DateFormats extends Maintenance {
 
-foreach ( glob( "$IP/languages/messages/Messages*.php" ) as $filename ) {
-       $base = basename( $filename );
-       $m = array();
-       if ( !preg_match( '/Messages(.*)\.php$/', $base, $m ) ) {
-               continue;
-       }
-       $code = str_replace( '_', '-', strtolower( $m[1] ) );
-       print "$code ";
-       $lang = Language::factory( $code );
-       $prefs = $lang->getDatePreferences();
-       if ( !$prefs ) {
-               $prefs = array( 'default' );
-       }
-       print "date: ";
-       foreach ( $prefs as $index => $pref ) {
-               if ( $index > 0 ) {
-                       print ' | ';
-               }
-               print $lang->date( $ts, false, $pref );
-       }
-       print "\n$code time: ";
-       foreach ( $prefs as $index => $pref ) {
-               if ( $index > 0 ) {
-                       print ' | ';
-               }
-               print $lang->time( $ts, false, $pref );
+       private $ts = '20010115123456';
+
+       public function __construct() {
+               parent::__construct();
+               $this->mDescription = "Test various language time and date functions";
        }
-       print "\n$code both: "; 
-       foreach ( $prefs as $index => $pref ) {
-               if ( $index > 0 ) {
-                       print ' | ';
+
+       public function execute() {
+               global $IP;
+               foreach ( glob( "$IP/languages/messages/Messages*.php" ) as $filename ) {
+                       $base = basename( $filename );
+                       $m = array();
+                       if ( !preg_match( '/Messages(.*)\.php$/', $base, $m ) ) {
+                               continue;
+                       }
+                       $code = str_replace( '_', '-', strtolower( $m[1] ) );
+                       $this->output( "$code " );
+                       $lang = Language::factory( $code );
+                       $prefs = $lang->getDatePreferences();
+                       if ( !$prefs ) {
+                               $prefs = array( 'default' );
+                       }
+                       $this->output( "date: " );
+                       foreach ( $prefs as $index => $pref ) {
+                               if ( $index > 0 ) {
+                                       $this->output( ' | ' );
+                               }
+                               $this->output( $lang->date( $this->ts, false, $pref ) );
+                       }
+                       $this->output( "\n$code time: " );
+                       foreach ( $prefs as $index => $pref ) {
+                               if ( $index > 0 ) {
+                                       $this->output( ' | ' );
+                               }
+                               $this->output( $lang->time( $this->ts, false, $pref ) );
+                       }
+                       $this->output( "\n$code both: " ); 
+                       foreach ( $prefs as $index => $pref ) {
+                               if ( $index > 0 ) {
+                                       $this->output( ' | ' );
+                               }
+                               $this->output( $lang->timeanddate( $this->ts, false, $pref ) );
+                       }
+                       $this->output( "\n\n" );
                }
-               print $lang->timeanddate( $ts, false, $pref );
        }
-       print "\n\n";
 }
 
-
+$maintClass = "DateFormats";
+require_once( DO_MAINTENANCE );

diff --git a/maintenance/language/dumpMessages.php b/maintenance/language/dumpMessages.php
index 35aeeb7..a0f0a9a 100644 (file)
--- a/maintenance/language/dumpMessages.php
+++ b/maintenance/language/dumpMessages.php
@@ -1,18 +1,44 @@
 <?php
 /**
- * @todo document
- * @file
+ * Dump an entire language, using the keys from English
+ * so we get all the values, not just the customized ones
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @ingroup MaintenanceLanguage
+ * @todo Make this more useful, right now just dumps $wgContentLang
  */
 
-/** */
-require_once( dirname(__FILE__).'/../commandLine.inc' );
-$messages = array();
-$wgEnglishMessages = array_keys( Language::getMessagesFor( 'en' ) );
-foreach ( $wgEnglishMessages as $key ) {
-       $messages[$key] = wfMsg( $key );
-}
-print "MediaWiki $wgVersion language file\n";
-print serialize( $messages );
+require_once( dirname(__FILE__) . '/../Maintenance.php' );
 
+class DumpMessages extends Maintenance {
+       public function __construct() {
+               parent::__construct();
+               $this->mDescription = "Dump an entire language, using the keys from English";
+       }
+       
+       public function execute() {
+               $messages = array();
+               foreach ( array_keys( Language::getMessagesFor( 'en' ) ) as $key ) {
+                       $messages[$key] = wfMsg( $key );
+               }
+               $this->output( "MediaWiki $wgVersion language file\n" );
+               $this->output( serialize( $messages ) );
+       }
+}
 
+$maintClass = "DumpMessages";
+require_once( DO_MAINTENANCE );